[XENOPROFILE] Update xenoprof linux side patch following Renato's comment.

 - compilation fix when CONFIG_OPROFILE=m with minor clean up
 - don't export xenoprof_is_primary.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c b/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c
index 2dd29eddc7a5d7464fe79bdac52ad0a0d07285cc..382a50f647882e00e6e680982d1559661ee84a1c 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c
@@ -48,7 +48,7 @@ static int xenoprof_start(void);
 static void xenoprof_stop(void);
 
 static int xenoprof_enabled = 0;
-int xenoprof_is_primary = 0;
+static int xenoprof_is_primary = 0;
 static int active_defined;
 
 /* Number of buffers in shared area (one per VCPU) */

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h
index fa43d62aef7994f1af456d5e6912c8317c8552be..2733e00ee46bf2418316f2a0a2590580189677b5 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h
@@ -21,7 +21,7 @@
  */
 #ifndef __ASM_XENOPROF_H__
 #define __ASM_XENOPROF_H__
-#ifdef CONFIG_OPROFILE
+#ifdef CONFIG_XEN
 
 struct super_block;
 struct dentry;
@@ -44,5 +44,5 @@ int xenoprof_arch_map_shared_buffer(struct xenoprof_get_buffer* get_buffer, stru
 struct xenoprof_passive;
 int xenoprof_arch_set_passive(struct xenoprof_passive* pdomain, struct xenoprof_shared_buffer* sbuf);
 
-#endif /* CONFIG_OPROFILE */
+#endif /* CONFIG_XEN */
 #endif /* __ASM_XENOPROF_H__ */

diff --git a/linux-2.6-xen-sparse/include/xen/xenoprof.h b/linux-2.6-xen-sparse/include/xen/xenoprof.h
index 54892b9597b59d00e1d27139e7b9a449d861b7c7..4c3ab0fb21419f00dd94c595d3b5a8ecf6640363 100644 (file)
--- a/linux-2.6-xen-sparse/include/xen/xenoprof.h
+++ b/linux-2.6-xen-sparse/include/xen/xenoprof.h
@@ -22,24 +22,21 @@
 
 #ifndef __XEN_XENOPROF_H__
 #define __XEN_XENOPROF_H__
+#ifdef CONFIG_XEN
 
-#ifdef CONFIG_OPROFILE
 #include <asm/xenoprof.h>
 
 struct oprofile_operations;
 int xenoprofile_init(struct oprofile_operations * ops);
 void xenoprofile_exit(void);
 
-extern int xenoprof_is_primary;
-#define is_xenoprof_primary()  (xenoprof_is_primary)
 struct xenoprof_shared_buffer {
        char                                    *buffer;
        struct xenoprof_arch_shared_buffer      arch;
 };
 #else
-#define xenoprofile_init(ops)  do { } while (0)
+#define xenoprofile_init(ops)  (-ENOSYS)
 #define xenoprofile_exit()     do { } while (0)
-#define is_xenoprof_primary()  (0)
-#endif /* CONFIG_OPROFILE */
 
+#endif /* CONFIG_XEN */
 #endif /* __XEN_XENOPROF_H__ */